From 9c66da2df18019124e55f3430d566f3e3643b710 Mon Sep 17 00:00:00 2001
From: Romain Francoise <romain@orebokech.com>
Date: Thu, 1 Mar 2007 13:58:24 +0000
Subject: [PATCH] Remove conflict marker.

---
 lisp/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 83a9434b254..51b42ebf997 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -45,7 +45,6 @@
 
 	* desktop.el: Delete header line listing me as maintainer.
 
->>>>>>> 1.10749
 2007-02-28  Glenn Morris  <rgm@gnu.org>
 
 	* tutorial.el (tutorial--describe-nonstandard-key): Tweak text in
-- 
2.30.2